From ebe6af1e310e21f9bc076dbb1bb33711f8138c82 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Fri, 3 Feb 2006 18:24:28 +0000 Subject: [PATCH] Update patches for Linux 2.6.16-rc2. Signed-off-by: Christian Limpach --HG-- rename : patches/linux-2.6.16-rc1-git4/i386-mach-io-check-nmi.patch => patches/linux-2.6.16-rc2/i386-mach-io-check-nmi.patch rename : patches/linux-2.6.16-rc1-git4/net-csum.patch => patches/linux-2.6.16-rc2/net-csum.patch rename : patches/linux-2.6.16-rc1-git4/pmd-shared.patch => patches/linux-2.6.16-rc2/pmd-shared.patch rename : patches/linux-2.6.16-rc1-git4/smp-alts.patch => patches/linux-2.6.16-rc2/smp-alts.patch --- .../i386-mach-io-check-nmi.patch | 0 .../net-csum.patch | 0 .../pmd-shared.patch | 0 .../smp-alts.patch | 74 +++++++++---------- 4 files changed, 37 insertions(+), 37 deletions(-) rename patches/{linux-2.6.16-rc1-git4 => linux-2.6.16-rc2}/i386-mach-io-check-nmi.patch (100%) rename patches/{linux-2.6.16-rc1-git4 => linux-2.6.16-rc2}/net-csum.patch (100%) rename patches/{linux-2.6.16-rc1-git4 => linux-2.6.16-rc2}/pmd-shared.patch (100%) rename patches/{linux-2.6.16-rc1-git4 => linux-2.6.16-rc2}/smp-alts.patch (84%) diff --git a/patches/linux-2.6.16-rc1-git4/i386-mach-io-check-nmi.patch b/patches/linux-2.6.16-rc2/i386-mach-io-check-nmi.patch similarity index 100% rename from patches/linux-2.6.16-rc1-git4/i386-mach-io-check-nmi.patch rename to patches/linux-2.6.16-rc2/i386-mach-io-check-nmi.patch diff --git a/patches/linux-2.6.16-rc1-git4/net-csum.patch b/patches/linux-2.6.16-rc2/net-csum.patch similarity index 100% rename from patches/linux-2.6.16-rc1-git4/net-csum.patch rename to patches/linux-2.6.16-rc2/net-csum.patch diff --git a/patches/linux-2.6.16-rc1-git4/pmd-shared.patch b/patches/linux-2.6.16-rc2/pmd-shared.patch similarity index 100% rename from patches/linux-2.6.16-rc1-git4/pmd-shared.patch rename to patches/linux-2.6.16-rc2/pmd-shared.patch diff --git a/patches/linux-2.6.16-rc1-git4/smp-alts.patch b/patches/linux-2.6.16-rc2/smp-alts.patch similarity index 84% rename from patches/linux-2.6.16-rc1-git4/smp-alts.patch rename to patches/linux-2.6.16-rc2/smp-alts.patch index 87f563f540..4555268012 100644 --- a/patches/linux-2.6.16-rc1-git4/smp-alts.patch +++ b/patches/linux-2.6.16-rc2/smp-alts.patch @@ -1,7 +1,7 @@ -diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/Kconfig ./arch/i386/Kconfig ---- ../pristine-linux-2.6.16-rc1-git4/arch/i386/Kconfig 2006-02-02 17:39:28.000000000 +0000 -+++ ./arch/i386/Kconfig 2006-02-02 17:45:59.000000000 +0000 -@@ -211,6 +211,19 @@ config SMP +diff -pruN ../pristine-linux-2.6.16-rc2/arch/i386/Kconfig ./arch/i386/Kconfig +--- ../pristine-linux-2.6.16-rc2/arch/i386/Kconfig 2006-02-03 16:11:47.000000000 +0000 ++++ ./arch/i386/Kconfig 2006-02-03 18:20:37.000000000 +0000 +@@ -202,6 +202,19 @@ config SMP If you don't know what to do here, say N. @@ -21,9 +21,9 @@ diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/Kconfig ./arch/i386/Kconf config NR_CPUS int "Maximum number of CPUs (2-255)" range 2 255 -diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/Makefile ./arch/i386/kernel/Makefile ---- ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/Makefile 2006-02-02 17:39:28.000000000 +0000 -+++ ./arch/i386/kernel/Makefile 2006-02-02 17:45:59.000000000 +0000 +diff -pruN ../pristine-linux-2.6.16-rc2/arch/i386/kernel/Makefile ./arch/i386/kernel/Makefile +--- ../pristine-linux-2.6.16-rc2/arch/i386/kernel/Makefile 2006-02-03 16:11:47.000000000 +0000 ++++ ./arch/i386/kernel/Makefile 2006-02-03 18:20:37.000000000 +0000 @@ -37,6 +37,7 @@ obj-$(CONFIG_EFI) += efi.o efi_stub.o obj-$(CONFIG_DOUBLEFAULT) += doublefault.o obj-$(CONFIG_VM86) += vm86.o @@ -32,9 +32,9 @@ diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/Makefile ./arch/i3 EXTRA_AFLAGS := -traditional -diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/smpalts.c ./arch/i386/kernel/smpalts.c ---- ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/smpalts.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./arch/i386/kernel/smpalts.c 2006-02-02 17:45:59.000000000 +0000 +diff -pruN ../pristine-linux-2.6.16-rc2/arch/i386/kernel/smpalts.c ./arch/i386/kernel/smpalts.c +--- ../pristine-linux-2.6.16-rc2/arch/i386/kernel/smpalts.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./arch/i386/kernel/smpalts.c 2006-02-03 18:20:37.000000000 +0000 @@ -0,0 +1,85 @@ +#include +#include @@ -121,9 +121,9 @@ diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/smpalts.c ./arch/i + asm volatile ("jmp 1f\n1:"); + mb(); +} -diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/smpboot.c ./arch/i386/kernel/smpboot.c ---- ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/smpboot.c 2006-02-02 17:39:29.000000000 +0000 -+++ ./arch/i386/kernel/smpboot.c 2006-02-02 17:45:59.000000000 +0000 +diff -pruN ../pristine-linux-2.6.16-rc2/arch/i386/kernel/smpboot.c ./arch/i386/kernel/smpboot.c +--- ../pristine-linux-2.6.16-rc2/arch/i386/kernel/smpboot.c 2006-02-03 16:11:47.000000000 +0000 ++++ ./arch/i386/kernel/smpboot.c 2006-02-03 18:20:37.000000000 +0000 @@ -1218,6 +1218,11 @@ static void __init smp_boot_cpus(unsigne if (max_cpus <= cpucount+1) continue; @@ -148,9 +148,9 @@ diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/smpboot.c ./arch/i local_irq_enable(); per_cpu(cpu_state, cpu) = CPU_UP_PREPARE; /* Unleash the CPU! */ -diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/vmlinux.lds.S ./arch/i386/kernel/vmlinux.lds.S ---- ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/vmlinux.lds.S 2006-01-03 03:21:10.000000000 +0000 -+++ ./arch/i386/kernel/vmlinux.lds.S 2006-02-02 17:45:59.000000000 +0000 +diff -pruN ../pristine-linux-2.6.16-rc2/arch/i386/kernel/vmlinux.lds.S ./arch/i386/kernel/vmlinux.lds.S +--- ../pristine-linux-2.6.16-rc2/arch/i386/kernel/vmlinux.lds.S 2006-01-03 03:21:10.000000000 +0000 ++++ ./arch/i386/kernel/vmlinux.lds.S 2006-02-03 18:20:37.000000000 +0000 @@ -34,6 +34,13 @@ SECTIONS __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { *(__ex_table) } __stop___ex_table = .; @@ -165,9 +165,9 @@ diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/vmlinux.lds.S ./ar RODATA /* writeable */ -diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/atomic.h ./include/asm-i386/atomic.h ---- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/atomic.h 2006-02-02 17:39:31.000000000 +0000 -+++ ./include/asm-i386/atomic.h 2006-02-02 17:45:59.000000000 +0000 +diff -pruN ../pristine-linux-2.6.16-rc2/include/asm-i386/atomic.h ./include/asm-i386/atomic.h +--- ../pristine-linux-2.6.16-rc2/include/asm-i386/atomic.h 2006-02-03 16:11:50.000000000 +0000 ++++ ./include/asm-i386/atomic.h 2006-02-03 18:20:37.000000000 +0000 @@ -4,18 +4,13 @@ #include #include @@ -188,9 +188,9 @@ diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/atomic.h ./include /* * Make sure gcc doesn't try to be clever and move things around * on us. We need to use _exactly_ the address the user gave us, -diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/bitops.h ./include/asm-i386/bitops.h ---- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/bitops.h 2006-02-02 17:39:31.000000000 +0000 -+++ ./include/asm-i386/bitops.h 2006-02-02 17:45:59.000000000 +0000 +diff -pruN ../pristine-linux-2.6.16-rc2/include/asm-i386/bitops.h ./include/asm-i386/bitops.h +--- ../pristine-linux-2.6.16-rc2/include/asm-i386/bitops.h 2006-02-03 16:11:50.000000000 +0000 ++++ ./include/asm-i386/bitops.h 2006-02-03 18:20:37.000000000 +0000 @@ -7,6 +7,7 @@ #include @@ -266,9 +266,9 @@ diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/bitops.h ./include "btcl %2,%1\n\tsbbl %0,%0" :"=r" (oldbit),"+m" (ADDR) :"Ir" (nr) : "memory"); -diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/futex.h ./include/asm-i386/futex.h ---- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/futex.h 2006-02-02 17:40:00.000000000 +0000 -+++ ./include/asm-i386/futex.h 2006-02-02 17:45:59.000000000 +0000 +diff -pruN ../pristine-linux-2.6.16-rc2/include/asm-i386/futex.h ./include/asm-i386/futex.h +--- ../pristine-linux-2.6.16-rc2/include/asm-i386/futex.h 2006-02-03 16:11:50.000000000 +0000 ++++ ./include/asm-i386/futex.h 2006-02-03 18:20:37.000000000 +0000 @@ -28,7 +28,7 @@ "1: movl %2, %0\n\ movl %0, %3\n" \ @@ -287,9 +287,9 @@ diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/futex.h ./include/ oldval, uaddr, oparg); break; case FUTEX_OP_OR: -diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/rwsem.h ./include/asm-i386/rwsem.h ---- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/rwsem.h 2006-01-03 03:21:10.000000000 +0000 -+++ ./include/asm-i386/rwsem.h 2006-02-02 17:45:59.000000000 +0000 +diff -pruN ../pristine-linux-2.6.16-rc2/include/asm-i386/rwsem.h ./include/asm-i386/rwsem.h +--- ../pristine-linux-2.6.16-rc2/include/asm-i386/rwsem.h 2006-01-03 03:21:10.000000000 +0000 ++++ ./include/asm-i386/rwsem.h 2006-02-03 18:20:37.000000000 +0000 @@ -40,6 +40,7 @@ #include @@ -370,9 +370,9 @@ diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/rwsem.h ./include/ : "+r"(tmp), "=m"(sem->count) : "r"(sem), "m"(sem->count) : "memory"); -diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/smp_alt.h ./include/asm-i386/smp_alt.h ---- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/smp_alt.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./include/asm-i386/smp_alt.h 2006-02-02 17:45:59.000000000 +0000 +diff -pruN ../pristine-linux-2.6.16-rc2/include/asm-i386/smp_alt.h ./include/asm-i386/smp_alt.h +--- ../pristine-linux-2.6.16-rc2/include/asm-i386/smp_alt.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./include/asm-i386/smp_alt.h 2006-02-03 18:20:37.000000000 +0000 @@ -0,0 +1,32 @@ +#ifndef __ASM_SMP_ALT_H__ +#define __ASM_SMP_ALT_H__ @@ -406,9 +406,9 @@ diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/smp_alt.h ./includ +#endif + +#endif /* __ASM_SMP_ALT_H__ */ -diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/spinlock.h ./include/asm-i386/spinlock.h ---- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/spinlock.h 2006-01-03 03:21:10.000000000 +0000 -+++ ./include/asm-i386/spinlock.h 2006-02-02 17:45:59.000000000 +0000 +diff -pruN ../pristine-linux-2.6.16-rc2/include/asm-i386/spinlock.h ./include/asm-i386/spinlock.h +--- ../pristine-linux-2.6.16-rc2/include/asm-i386/spinlock.h 2006-01-03 03:21:10.000000000 +0000 ++++ ./include/asm-i386/spinlock.h 2006-02-03 18:20:37.000000000 +0000 @@ -6,6 +6,7 @@ #include #include @@ -488,9 +488,9 @@ diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/spinlock.h ./inclu : "=m" (rw->lock) : : "memory"); } -diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/system.h ./include/asm-i386/system.h ---- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/system.h 2006-02-02 17:39:31.000000000 +0000 -+++ ./include/asm-i386/system.h 2006-02-02 17:45:59.000000000 +0000 +diff -pruN ../pristine-linux-2.6.16-rc2/include/asm-i386/system.h ./include/asm-i386/system.h +--- ../pristine-linux-2.6.16-rc2/include/asm-i386/system.h 2006-02-03 16:11:50.000000000 +0000 ++++ ./include/asm-i386/system.h 2006-02-03 18:20:37.000000000 +0000 @@ -5,7 +5,7 @@ #include #include -- 2.30.2